Merge "Move the "v1" to an adjacent key component in Title::loadRestrictions"

diff --git a/includes/Title.php b/includes/Title.php
index 2e43b8d..d8aeb62 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3342,7 +3342,7 @@ class Title implements LinkTarget, IDBAccessObject {
                                $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
                                $rows = $cache->getWithSetCallback(
                                        // Page protections always leave a new null revision
-                                       $cache->makeKey( 'page-restrictions-v1', $id, $this->getLatestRevID() ),
+                                       $cache->makeKey( 'page-restrictions', 'v1', $id, $this->getLatestRevID() ),
                                        $cache::TTL_DAY,
                                        function ( $curValue, &$ttl, array &$setOpts ) use ( $loadRestrictionsFromDb ) {
                                                $dbr = wfGetDB( DB_REPLICA );